bitkeeper revision 1.750 (403cc10fkuNlzKO1N7h49MurLXmpCQ)

Merge ssh://srg//homes/maw48/xeno-unstable-tbufs-new.bk
into equilibrium.research.intel-research.net:/home/irchomes/mwilli2/src/xeno-unstable.bk

diff --cc tools/xentrace/xentrace.c
index ab170050c7ce425278159642ec1fd6f8f630f46d,8ac48331ffb722acff788ed4450f690cd28ba401..4fa6c696e1d02fc7f0fc738b6ab87c1c578b75bd
--- 1/tools/xentrace/xentrace.c
--- 2/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@@ -407,10 -435,10 +435,9 @@@ int main(int argc, char **argv
  {
      int ret;
      FILE *logfile = stdout;
 -
 -    const struct sigaction act = { .sa_handler = close_handler };
 +    struct sigaction act;
  
      opts.outfile = 0;
-     opts.num_cpus = 1;
      opts.poll_sleep = millis_to_timespec(POLL_SLEEP_MILLIS);
      opts.new_data_thresh = NEW_DATA_THRESH;
  

diff --cc xen/common/dom0_ops.c
Simple merge